From e161c700d607993f8eb1732e5b2b23c3e6e69520 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sun, 24 Jun 2012 14:01:54 +0200 Subject: [PATCH] dont run check targets in build, to allow running them separately later Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243 Gbp-Pq: Name build-dont-run-checks.diff --- Makefile.top | 10 ++++++++-- solenv/bin/build.pl | 2 +- solenv/gbuild/Module.mk | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile.top b/Makefile.top index c192dc5092f..31690247942 100644 --- a/Makefile.top +++ b/Makefile.top @@ -244,7 +244,7 @@ xsltml\ zlib\ gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules) -export gb_TAILBUILDTARGET=all slowcheck +export gb_TAILBUILDTARGET=all define gbuild_module_rules .PHONY: $(1) $(1).all $(1).clean $(1).deliver @@ -487,11 +487,17 @@ findunusedcode: | grep -v WPX \ > unusedcode.easy -check: dev-install subsequentcheck +check: unitcheck slowcheck dev-install subsequentcheck subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install) $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ +unitcheck: + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ + +slowcheck: + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ + debugrun: $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 74d0f32ee08..daa4ae0d63a 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -1901,7 +1901,7 @@ sub run_job { return 1 if (! $path =~ /prj$/ ); mkpath("$workdir/Logs"); my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM}; - my $gbuild_target = 'all slowcheck'; + my $gbuild_target = 'all'; if ($registered_name =~ /tail_build\/prj$/ ) { $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM}; diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index e5f87f0f5cd..9c2608cc856 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT= debugrun :| build endif -all : build unitcheck +all : build $(info $(gb_Module_BUILDHINT)) build : -- 2.30.2